Fixed for Spout users