This fixes #662