Apply patch from https://github.com/tekskater
Fix version