Changed return value, so that the event still dispatch