Fix for embedded version (111)