Fixed a bug again..