BUGFIX Reorder condition fix