Fixes, done by Maya
New fix.