Fixed a crash caused by the merge with develop.