Fix fail introduced by my merge