Fix for rewritting code #5