Can't override CakeEmail class and use deliver

When using TemplateEmail::deliver it always create new instance of CakeEmail, I assume it should create my extended "TemplateEmail" class insted.

PHP >5.3 compatible

lib/Cake/Network/Email/CakeEmail.php

@@ -1203,7 +1203,7 @@ public function send($content = null) {
  * @throws SocketException
  */
 	public static function deliver($to = null, $subject = null, $message = null, $transportConfig = 'fast', $send = true) {
-		$class = __CLASS__;
+		$class = get_called_class();
 		/** @var CakeEmail $instance */
 		$instance = new $class($transportConfig);
 		if ($to !== null) {