this is pretty 'liberal', why we need this change? :grin: