Fixed a bug cause Jan said to