Really complicated fixing