2048 fixes (close #184)

At least on my system that makes it work flawlessly.