resolved #58