#522 fixed