commit before refactoring
devise workaround