diff --git a/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/PipelineCommand.scala b/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/PipelineCommand.scala
index 6a245cdfd121fc45b2be6d153397d7f88bb06072..b1ffde56f2d371788f6cfb1d309a63c94b5d1b3d 100644
--- a/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/PipelineCommand.scala
+++ b/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/PipelineCommand.scala
@@ -1,6 +1,7 @@
 package nl.lumc.sasc.biopet.core
 
 import org.broadinstitute.gatk.queue.util.{ Logging => GatkLogging }
+import nl.lumc.sasc.biopet.core.workaround.BiopetQCommandLine
 
 trait PipelineCommand extends MainCommand with GatkLogging {
 
diff --git a/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQCommandLine.scala b/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/workaround/BiopetQCommandLine.scala
similarity index 98%
rename from biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQCommandLine.scala
rename to biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/workaround/BiopetQCommandLine.scala
index 02c17e2f8038f811423d34d6ddc0e864ba09c3f1..0df441caadb1a2906bcc215ac3e90aa61da963aa 100644
--- a/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQCommandLine.scala
+++ b/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/workaround/BiopetQCommandLine.scala
@@ -24,7 +24,7 @@
 * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-package nl.lumc.sasc.biopet.core
+package nl.lumc.sasc.biopet.core.workaround
 
 import java.io.File
 import org.broadinstitute.gatk.utils.commandline._
@@ -32,6 +32,7 @@ import org.broadinstitute.gatk.queue.util._
 import org.broadinstitute.gatk.queue.QCommandPlugin
 import org.broadinstitute.gatk.queue.QScript
 import org.broadinstitute.gatk.queue.QScriptManager
+import org.broadinstitute.gatk.queue.util.{ Logging => GatkLogging }
 import org.broadinstitute.gatk.queue.engine.{ QStatusMessenger, QGraphSettings, QGraph }
 import collection.JavaConversions._
 import org.broadinstitute.gatk.utils.classloader.PluginManager
@@ -43,11 +44,12 @@ import java.net.URL
 import java.util.{ ResourceBundle, Arrays }
 import org.broadinstitute.gatk.utils.text.TextFormattingUtils
 import org.apache.commons.io.FilenameUtils
+import nl.lumc.sasc.biopet.core.BiopetExecutable
 
 /**
  * Entry point of Queue.  Compiles and runs QScripts passed in to the command line.
  */
-object BiopetQCommandLine extends Logging {
+object BiopetQCommandLine extends GatkLogging {
   /**
    * Main.
    * @param argv Arguments.