Fixed a nasty bug, in which the new shortcode would hang on startup.