fixing class/module collision