bug fix attempt #1