Fixing Yasu again