Fix the problem's now for testing