#72 resolved