Adjust previous fix
Merge remote-tracking branch 'origin'
added test for issue #86