Fixed issue #423
Merge pull request #472 from willynilly/issue_423

Fixed issue #423