Readded check that was "not needed" :/