Fixed a bug with the analog templates