Hopefully a better boolean guard...