Barton, fixes #483