Bugfix: Cannot redeclare class