Added checks to avoid filling SR