#82 resolved