Fixing bug from commit 041d17373e04