Hacks to make it work with A+