Take 2 at fixing it...