Related to #137
work around for #137