Fix for general case