Fixed an issue with conflicting class paths