Fixed issue # 8.