Fixed Bug(Maybe ╮(￣▽￣")╭)