[#45988977] still needed some tweaking