put all fixes back