Merge pull request #24 from juju/placement-fix