Hot ninja fix