fix to use both of primary and secondary for start check
fix to return false explicitly for readability