Correcting the canHandle conditions.