fixed reminder
merged