bugfix for issue raised in #435