resolved #349