Fix for bug with double loaded event