re #902: fixed bugs