Issue #476

X Marks The Spot