Partial fix for new forum 2.3.0.7pre1a