real fixes for 62857