Fix #297
Merge pull request #298 from anteprimorac/patch-3

[3.0] Fix #297