merge fix from hand