Addressed potential key size issue