Ok, I did that. Also fixed the index that you mentioned in another comment - tests caught that.