Fix for Latest firmware 4.0