Issue #373 - Partial fix - at least when using bootstrap.