Regression tests #214 and #288