Fixed crash due to merge