Fixed potential exploit caused by previous commit