Order: added constants
order: bugfix