Fixed for RxJS 2.2