Resolved #9