_really_ fixing checks >_>