Bug fix for incorrect HTML return