added more logging to help track down the cause of issue #133
dont use drain for now