#52 fixed