Makes things a bit more responsive, essentially fixes #2