https://github.com/karanmg/fmbase/issues/1489 Tweak