Fixed issue # 6.