better use of dictionary, crashes after save of sourced statement