Kevin Brady, fixes #463