split fixes done