corrected changeset reference
using guava optional