Feature/with angular busy

@myabc Does this have to be fixed? And if so any ideas?