Fixes problem with propagate in last commit
Fixes tests