for review by BR

@rakitzis Could you approve this fix?