#506 fixed