Removed buggy optimization