BugFix01

Bug Fix for ?2