bug fix for spaces 2