Bug Fix

closes #7