Fixing target creation and retrieval