Fixes # Changes in this pull request: - Notes & caveats: - @scossu