hot fixes #2