bugfix; subsumes infinite loop