#48 resolved