Template crash fix... again