(#TS-2, #TS-3) Fixed