Fixed support for fillSlot option