Added 'credits' to client.fill, remove template.fill