fix suggested by Sarig Sela