JAL-1601 bugfix on previous commit