Fixed bug with resolving forward directions