Made listeners thread safe
Fixed bug. Register was considered new on each update