Fixes #612