NOJIRA reverted some changes that caused failure
basically checked in incorrect code.