Fix eventqueue