updated for version 3.8.4