Fixed; tested