Fixes #1388