Fixes #656

#656