Fixing slot issue on create
Merge pull request #1088 from andrerod/dev

Fixing slot issue on create