diff --git a/omz b/omz
index 531e31655..734473e64 100644
--- a/omz
+++ b/omz
@@ -47,11 +47,11 @@ omz() {
       # load plugins (TODO: Make this slimmer and better)
     #  for plugin ($fpath/*.plugin.zsh(N)) source $plugin
       for plugin ($plugins); do
-        plugin_sub=$(echo $plugin|cut -d'/' -f2)
-        if [[ -f $OMZ/plugins/$plugin/$plugin_sub.plugin.zsh ]]; then
+        plugin_sub=$(basename $plugin)
+          if [[ -f $OMZ/plugins/$plugin/$plugin_sub.plugin.zsh ]]; then
         source $OMZ/plugins/$plugin/$plugin_sub.plugin.zsh
         elif [[ -f $ZSH/plugins/$plugin/$plugin_sub.plugin.zsh ]]; then
-        source $ZSH/plugins/$plugin/$plugin_sub.plugin.zsh
+          source $ZSH/plugins/$plugin/$plugin_sub.plugin.zsh
         fi
       done