Fixes #662

#662