Better fix for JAVA-213