Enhance previous fix. references #2725