Small bug fix/improvement