Fix the -* bug
see last few commits