Issue #495 Removed puzzle