hot fixes for merge