0.5.1 - fix for handling attribute indexes