Issue #421 removed extra div