Fixes CG-CamSys/Backlog#55

Fixes CG-CamSys/Backlog#55