fixed to use module with class