#55 resolved