3.11 add safety for +-