Bug fix (It works now!)