Hopefully all issues are fixed