@panuinth , check out these small changes ... see notes on the PR for details on what it does.