data/code fix thanks to the author of Emulicious