Fixes #618.