#92 Tiny improvement