Little fix to make it robust to Squad's 50 ways of doing something