Possibly bugs fixed.