fix for issue #144 (merge from alpha and beta)