Fixed #1392 -- allow more combinations of p and q's bit lengths