Fix for ktoso#116