final (?) time fix