#493 fixed