Fix #1, #35 tcos