hopefully final bug fix