#534 fixed