Fixing user bug