--- a/Implab/PromiseExtensions.cs	Sat Dec 12 22:12:44 2015 +0300
+++ b/Implab/PromiseExtensions.cs	Thu Feb 04 02:43:05 2016 +0300
@@ -287,13 +287,10 @@
             
         #if NET_4_5
 
-        public static Task<T> GetTask<T>(this IPromise<T> that) {
+        public static PromiseAwaiter<T> GetAwaiter<T>(this IPromise<T> that) {
             Safe.ArgumentNotNull(that, "that");
-            var tcs = new TaskCompletionSource<T>();
 
-            that.On(tcs.SetResult, tcs.SetException, r => tcs.SetCanceled());
-
-            return tcs.Task;
+            return new PromiseAwaiter<T>(that);
         }
 
         #endif