#54 fixed