Fixed search space issue