Fix for double class declaration