Restored soem stupid mistakes