Improved firedorb, fixed 'slow drain' issue