Fix the 500ms bug. for now..