Bug Fix for Order Object