Fixes #486
Fixes #483 maybe