Fixes to actually do it correctly