Race around condition in jk flip flop?

The "Race Around Condition" occurs when J+K=1 i.e. When the FF is in the toggle mode.
the race around condition in JK latch can be avoided by:
a) Using the edge triggered JK flip flop.
b) Using the master slave JK flip flop.