Fix commit fd7e05b