Fixed inconsistencies between prior versions and the current approach