Bug fixin.