Fixed issue # 11.