#552 fixed