fixed sagahandler