Toolkit update

#665 is related issue