Resolved #8