Made things slightly less broken