Potential fix for manufacturer stupidity