Improve for #152