Fix for slot ghosting

See issue #52 for notes