Fixed a bug again