Fix class/module missmatch