Fixing propagation bug