added hot fix 6