Bugfix due to new optimizations