Fix for regression