Fixed a breaking bug