Fix for rewritting code #6 (final?)