Guards no longer crash
merge