Placement/Offset bug fix