Gillibrand, fixes #497