Try to fix slots, totally untested