Addition of fix from issues