Reverted back to pre-nav problem version