Fixed pull-request problems 2-0-1