Fixes #496 Or should