* v4.1 compatibility fix