Fixes #474
Build #474