Quick fix for #319, leaving 0 values untouched