Small Bug fixed in mafast (NA-Treatment might still be off)