Fix for association and views