implement buddy 0.7.2 changes