Hopefully fixed angular-js issues
Hopefully fixed angular-js issues