Fix slot assignment