bug fix | crashes