Fix quench subject conversion