fix for #601 - read more on org page