Bug Fix

Fixed bug in last commit