ModelServiceImpl Bugfix