Fixes Issue #126, now correctly navigates to cluster