Fix #14 and remember alert added