Fix for JUnit failture