workaround pepper bug