Fix same-package check