Bug fix on class loader