Includes workaround (sort of) to merge memory issue