fix for many issues