Fixes, now we can avoid placing the follower