Fix to solution