Resolved #99