BUGFIX: pataches issue #40