Fixed a breaking issue