Bug fixin'.