Fixing Intent bug