avoid RuntimeError exception
Merge branch 'v1.0.3_fixes'