Fixed issue # 4.