Fix #451
Merge pull request #492 from nickskull/develop-v3

Fix #451