Fixes #1255