#47 resolved