add fix from SpringBot