Fix for #604.
Merge pull request #614 from aktado/issue/604

Fix for #604.