Fixed repeated method template
Updated version