hand fix final (for real)