#499 fixed