more changes to isolate bug