Commiting so patrick's version doesn't crash