re #224: fixed bugs