Fix map property reference by using self instance of this

replace #439