Fixed merge of wrong versions

Getting compile errors from merging wrong versions, now fixed!