fix bug - another try