fixed off bug