         loaded = $img.attr('src').substr(-(current.length))
         return unless loaded is current
 
-        set view, 'loading', false #exit loading state
+        set(view, 'loading', false) if $img.prop 'complete' #exit loading state
   })
 
   ###


    $img.removeAttr 'src'

    # Do nothing if the src property is empty
    if jQuery.trim(src) is ''
      return @

    set @, 'loading', true #enter loading state


    @chainable
  ###
  loadingDidChange: observer('loading', ->
    @sendAction('action', get(@, 'loading'))
    @
  )

  _setupElement: Ember.on('didInsertElement', ->
    Ember.run.scheduleOnce('afterRender', @, 'srcDidChange')
  )

  _teardownElement: Ember.on('willDestroyElement', ->
