Resolved #68