improve fix for 39e458896052db55ea493b5fc983e046b6c527bc