Fixing Yoshiki's bug