Fixes #615