Fix for LazyModel infinite recursion