Fixed a memory issue that was causing crash and slowdowns on android