Resolved #12