Minor bug resolve