#217 and #287