Fix issue 562
Merge pull request #563 from LocutusOfBorg/562-fix

Fix issue 562