#149 Fixed rare cases of incorrect completion propagation