issue #74 angular code