diff --git a/special_menu_items.module b/special_menu_items.module
index 3356757..8fb309f 100644
--- a/special_menu_items.module
+++ b/special_menu_items.module
@@ -75,14 +75,23 @@ function special_menu_items_menu_link(array $variables) {
     switch ($element['#href']) {
       case '<nolink>':
         $tag = variable_get('special_menu_items_nolink_tag', '<span>');
+        $element['#attributes']['class'][] = 'nolink';
+
+        // Handling of A tag with standard drupal API
+        if ($tag == '<a>') {
+         $element['#href'] = current_path();
+         $element['#localized_options']['fragment'] = ' '; // Space required for url() function restrictions 
+         $variables['element']=$element;
+         return theme('menu_link_default',$variables);
+        }
+
         $title = strip_tags(l($element['#title'], $element['#href'], $element['#localized_options']));
-        $attrs = $element['#original_link']['options']['attributes'] ?: array();
+        $attrs = $element['#original_link']['options']['attributes'] ? $element['#original_link']['options']['attributes']
         // Set a class if the link is in the active trail.
         if (!empty($element['#original_link']['in_active_trail'])) {
           $attrs['class'][] = 'active-trail';
         }
         $output = special_menu_items_render_menu_item($tag, $title, $attrs);
-        $element['#attributes']['class'][] = 'nolink';
         break;
 
       case '<separator>':
@@ -126,7 +135,7 @@ function special_menu_items_preprocess_page(&$vars, $hook) {
           case '<nolink>':
             $tag = variable_get('special_menu_items_nolink_tag', '<span>');
             $title = $vars[$menu][$key]['title'];
-            $attrs = $vars[$menu][$key]['attributes'] ?: array();
+            $attrs = $vars[$menu][$key]['attributes'] ? $vars[$menu][$key]['attributes'] : array();
             $vars[$menu][$key]['title'] = special_menu_items_render_menu_item($tag, $title, $attrs);
             $vars[$menu][$key]['attributes']['class'][] = 'nolink';
             break;