Yikes, this was making some troubles
Merge pull request #1256 from mfalesni/prefer-none

Yikes, this was making some troubles