Better fix for the show orders bug