Bug Fixed; Generic propagation working