#3188

I have just resolved all issues, please recheck.