address related concerns raised in #184