fixes #502

As discussed