fix for shortcodes. part 2