OK maybe this is needed after all.