• fixes minor bug #9891;


• minor code clean up;