Fixed a bug here