Fix to subtract
Merge branch 'test'