Fix for rewritting code #3