Fixed a nasty bug that caused hangs in the default shortcode.