Fixed By Yuval Markovich - working after a minor bug testing