fix according to Waldek's comments