Bring fix for #204 into develop