Fixed infinite loop
auto-merge staging into master