Yes, wasn't able to completely fix this either