updated for version 1.5.8