Bug Fix

Complete.