FIX: new fix for issues #251 and #252.