JAL-3141 Made one more suggested change from code review