Bugfix: Avoid unnecessary instances