fixed d and g issue??