FOOB-82 - Fixing classpath issue