#120 better fix for this bug