TRACK-11 fixed with footer