Tiny fix and speed improvement