~ fixes for extending