Spout fix