attempted fixed bug