Fixes ID 1 and 2