fix according to discussion on bugTracker