fixed first-use bug