diff --git a/gruntFile.js b/gruntFile.js
index 37ac4dd..5362ce8 100644
--- a/gruntFile.js
+++ b/gruntFile.js
@@ -6,7 +6,7 @@ module.exports = function (grunt) {
   // Default task.
   grunt.registerTask('default', ['jshint', 'karma:unit']);
   grunt.registerTask('serve', ['connect:continuous', 'karma:continuous', 'watch']);
-  grunt.registerTask('dist', ['ngAnnotate', 'uglify']);
+  grunt.registerTask('dist', ['uglify']);
 
   // HACK TO ACCESS TO THE COMPONENT-PUBLISHER
   function fakeTargetTask(prefix){
@@ -112,19 +112,10 @@ module.exports = function (grunt) {
     uglify: {
       options: {banner: '<%= meta.banner %>'},
       build: {
-        expand: true,
-        cwd: 'dist',
-        src: ['*.js'],
-        ext: '.min.js',
-        dest: 'dist'
-      }
-    },
-
-    ngAnnotate: {
-      main: {
         expand: true,
         cwd: 'src',
         src: ['*.js'],
+        ext: '.min.js',
         dest: 'dist'
       }
     },
diff --git a/package.json b/package.json
index 9b76a11..2d5e2b6 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,6 @@
     "grunt-contrib-watch": "~0.6.0",
     "grunt-conventional-changelog": "~1.1.0",
     "grunt-karma": "~0.9.0",
-    "grunt-ng-annotate": "0.8.0",
     "karma": "~0.12.0",
     "karma-chrome-launcher": "~0.1.1",
     "karma-coffee-preprocessor": "~0.2.1",
diff --git a/src/ui-codemirror.js b/src/ui-codemirror.js
index 480f4f2..fce424e 100644
--- a/src/ui-codemirror.js
+++ b/src/ui-codemirror.js
@@ -5,7 +5,7 @@
  */
 angular.module('ui.codemirror', [])
   .constant('uiCodemirrorConfig', {})
-  .directive('uiCodemirror', uiCodemirrorDirective);
+  .directive('uiCodemirror', ['$timeout', 'uiCodemirrorConfig', uiCodemirrorDirective]);
 
 /**
  * @ngInject