Combined with previous commit(s). Issue:  fixes #1