appears to be fixed but need to test them more
error fixed