fixes on rendering interuption done by @ssppgit
merge