fixed bug from testing version