this should work better

sorry for the tiny little pull requests. This is all I've got.