Resolved #308