Fix commit adb3c360