AAD-79: props fix