Fixes #1424