Bugfix: ClassNotFoundException