resolved #27 issue