fixed original bug, broke code in new manner