issue #1253 (this should be fixed too, but I couldn't reproduce the issu...

...e) and #1254  (for sure)