Bug Fix

#17