Notes and fix of silly optimization gone wrong