martin fix stuff