Fix attribute calls