Fix for broken commit f9f5ca3419e5dc0ede7bc57641783e62289ebcf9