Bug-fix:

 - Minor corrections to previous commit