Fix streak bug & undefined this