issues #217 and #287