Fix to unbreak backwards compatibility