Issue #11: Only put and use the stamp if it is needed.