Fix/secure output