Fixing user case