Fix problems with commit 4c42128