Fix slots issue