Bug fix for last passed