fixed disorder bug