Fixed matching issue on last commit