Minor Bug Fix

Fixed a minor bug based on shkesar’s merge request.