fix issue #6 (Block screen on rotate)
merge issue fix