fix related to slots