Fix extension meethods