Fixed a bug cause Rainer said to