Fixes #584.