fixes for last