Moved handling from Target to Dispatcher, fixed edge cases