#27 more magic fixed, #2 fixed method calls