i dont think this check is actually required... and would clean up a lot of code if it wasn't