Fixed work with statuses