last minute workaround for issue #48