Fixing last commit bug 1