hot fixes minimal