Fix substring