fixing models and modules