Yoram pic fix