fix for latest commits