Fixing performance issues due to lazyness