fixed zero issues