Bug: Removed extra HTML