i've wanted to fix this too