Orignal Bug Fix