More bug Fixes
Working Bug Fix