ni-ka's fix.