Fix Bug and Add Test
Update Runnable