fixup! fixup! fixup! ported from backbone to angular