reverts change and fixes error