Disabled CommandEvent - it seems to be breaking commands