Bug fix
Final version