restored gilads hack - it does work now