Fixes on #284

See my previous [comment](https://github.com/Netflix/RxJava/issues/282#issuecomment-19013992)