Added Yoram's fix