Bugfix for enquiry