fix for angular resolution
Merge commit '83159c0a246b2cecbbc52c329bb04a8d3e20251b' into HEAD