Fixes crash #87