fixes for HR-306

fixes for HR-306