Resolved #338