Correct fix for Slim #1431, #1434, #1435
Merge pull request #1437 from minad/correct-slim-fix

Correct fix for Slim #1431, #1434, #1435