Test case and fix for issue from Hugo