Trying to fix rendering weirdness