Small fix, optimize