Fixes #616