Fix to reuse HTML5 tech (2)

New pull request regarding #884

Thank you for the suggestions, everything work fine and is done in a clean way :)