fixed more magic stuff