fixed terrible bug