fixed small issue in merge between master and working branch