Fixed solution errors