Additional small fix