Fixed handling of flow source implementation for issue #206