Fix issue with abstract models