Fixed: more intelligent version of last commit

S-M-R-T