Fix for "unused variable" issue