Fix bug with excessive slots