Remove behavior that broke class
Merge pull request #38 from cam156/user_fix

Remove behavior that broke class