Bug fix for last commit