* Trying to fix browser crash issue