fixing user and dest handling