FIX: extended last fix for #366.