found last min bug should be fixed