Introduced fix for previous fixes