Resolved #167