Fixing broken code introduced in commit 0f3d35d4999c215d961197c86ee60319b648e696