Fix the issue six