Fix to 578b918