fixed https://github.com/shekhargulati/milestogo/issues/82. Also fixed https://github.com/shekhargulati/milestogo/issues/85