Fixes issue #164

Removed the use of flatMap() with a custom operator.