Fixes #502