Bugfix for aliasing problem