bug fix attempt 2