finally fixed (for the time being)