more bugs - more fix