Fix for IGAS v39, use event insteal of script event