minor changes to see if it works in enigma, but it doesn't