Fix bug in latest commit