Resolved #358