baseline bug fixed