#41 fixed