quick fixed on the fly