Runtime fix (CanPass)