fix for non-zero issues