Bug fix
Update ids for testing purpose