Fixed runtime crash