resolved #96