Attempting Bug Fix