BUG-FIX Removed duplicated events, "change" is enough