Make errors
Merge pull request #1266 from psav/last_fix

Make errors