Fix slot issue