Resolved #348