Reverted Changes Because of bug