Fix double creation