Improve previous commit (EJAB-1639)