Fixed issue #332
Merge pull request #335 from LocutusOfBorg/fix-332

Fixed issue #332