Fixed legacy method to please the JUnitTests