Merge "Fixing crash on allocation"