SQL Fix after 933381f