Sails final fix