Bennet, fixes #479