TOMEE-1154 minor improvement