CanCan bug fix from https://github.com/ryanb/cancan/issues/835#issuecomment-18663815