This is my workaround at the moment, but it's terrible. Any better ideas about where I could fix this?