Additional fix based in feedback from @JaredF