Will fix both