Added fix for norm timeout