fixed https://github.com/shekhargulati/milestogo/issues/102 and fixed https://github.com/shekhargulati/milestogo/issues/4