-Fix origin block not getting used correctly