STORM-297: fix flusher bug, dead loop