resolved #21, finally