skip logic model IoC complete. Also fixes #667