Fixes #612.