fix for weird +/- behavior
Merge origin/master