This should finally fix the issue with the non working "auto fill