Closed issue REF-77