fixed ver
copied from master