Fixing broken commit 55156cbf