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