working on some fix