Bug Fix Attempt...