#46 resolved