Fixing last minute bug