temp fix for issue #223