Fixed crash on current build