Change default property + output bugfix