Bugfix content blocks