Prepared for dev
Potential fix for manufacturer stupidity