#545 fixed