Fixed bugs (without validation).