Yoda fix