Fixes 476

Fixes #476