fixed firstpass version