[DF-677] fix - MacOS X. No Save functionality yet.