Bug Fix

Fix for previous change.