fixes for 15