Temporary workaround for event API rubbishness