#82 - fixed