fixed references to models