fastfix
Merge pull request #8319 from HuXTUS/fastfix-boats

fastfix for boats