Fixed reloading bug
remove duplicate undefined check
Merge branch 'pepf-master'
fix undefined error