#44 fixed