BUGFIX: don't redeclare class