Editor fix for delay issues