Fix for Fix Console Errors #4