improve and fix exposure event