fixed annoying issue on new android versions