Fixing crashing bug from the last commit