Second try to fix problems