diff --git a/composer.json b/composer.json
index c302e8a3e..173c0b622 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "jenssegers/mongodb",
-    "description": "A MongoDB based Eloquent model and Query builder for Laravel 4",
+    "description": "A MongoDB based Eloquent model and Query builder for Laravel",
     "keywords": ["laravel","eloquent","mongodb","mongo","database","model"],
     "homepage": "https://github.com/jenssegers/laravel-mongodb",
     "authors": [
@@ -11,14 +11,14 @@
     ],
     "license" : "MIT",
     "require": {
-        "illuminate/support": "^5.1",
-        "illuminate/container": "^5.1",
-        "illuminate/database": "^5.1",
-        "illuminate/events": "^5.1"
+        "illuminate/support": "~5.1.0",
+        "illuminate/container": "~5.1.0",
+        "illuminate/database": "~5.1.0",
+        "illuminate/events": "~5.1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.0|^5.0",
-        "orchestra/testbench": "^3.1",
+        "orchestra/testbench": "~3.1.0",
         "mockery/mockery": "^0.9",
         "satooshi/php-coveralls": "^0.6"
     },
diff --git a/src/Jenssegers/Mongodb/Query/Builder.php b/src/Jenssegers/Mongodb/Query/Builder.php
index 1311d9aea..62f357a6b 100644
--- a/src/Jenssegers/Mongodb/Query/Builder.php
+++ b/src/Jenssegers/Mongodb/Query/Builder.php
@@ -790,7 +790,7 @@ protected function performUpdate($query, array $options = [])
      */
     public function convertKey($id)
     {
-        if (MongoId::isValid($id))
+        if (is_string($id) and strlen($id) === 24 and ctype_xdigit($id))
         {
             return new MongoId($id);
         }
diff --git a/test.php b/test.php
deleted file mode 100644
index 146b519b9..000000000
--- a/test.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php require 'vendor/autoload.php';