To fix DOG-4 this commit is to help fix the bug