fixed consumerserver bug
merging