fixed needed due to change db model