Critical bug on EDT fixed