Resolved #88