Bug fixing fixed values