add zero bug support