Fixing last error (now I got the spec ;)