1.6 - Fixing shortcodes