Fixing conditions in helper.