@cdituri @ediosyncratic take a look at 7bb5fb4747575845d60fdbf2e439f6c12d284aaf, I think it does the right thing