Bug Fix Attempt #2