Merge a further fix related to #288