Apply kraffslol's fork