More bug fixen.