Fix target order