Bug Fix for Version1