#89 - fixed