fixes edge cases for container group #1