Hot fix for wrong namespace