Fixes CG-CamSys/Backlog#55