Fixed classloading issue