More efficient #4632