Fix commit 31ca000d