Fixed DrainedAt logic.