Refactor
Applying fix: https://github.com/flaccid/application_ruby/commit/4323f32a0e85a3aa752e6464d60f697e693bbef8