fix
Merge branch 'placements'