@secondsun what do you think? Not sure if this change is really necessary