arrgh - committed unfinished code by accident together with bugifx