Fix to bc3fad1