Patched the crashing issue