fc

Hello everyone, Can someone please check this PR when you are free? Many thanks!

Thanks for your time, @wgtmac. have added a test case.