Fix for class paths issue