workaround that resolves #153 and #152