Fixing broken code from commit 0e5824ef47eaf8302448f1a4fe999731234ec798