fixed the issues we were having