fixed #96, fixed generator for orms