#516 fixed