199 Fixing previous version merge issue