Added converter fixed (so far)