feature #5157 fixing a / by zero exception
feature #5157 fixing library conflict, temporary commit before JUnit fix