JAL-2157 bugfix for regression from commit 82a6c8e2e25b7534168b68b2c89b9cf195f815a5