just to avoid possible errors like in nextgen branch