Fixed incorrect id being used