fixes the singleton conversion