Resolved #Issue18