Fixed Issue # 7