fixing user manipulation bug