Actually the fix by Zaknarfen needs multiple file changes, here is another one that might be related