fixed infinite recusion 'hopefully'