Fixes #1418