Fixed #311
Merge pull request #335 from mhitza/port-450

Fixed #311