Fix logic error
Merge remote-tracking branch 'public/rubocop_lint' into rubocop_lint