Follow-up of issue#424 - Karakeep