Trying to fix pending bug