small fix + improvement