fixed (works with 1.9)