fixed issues with new opaque keys