Fix for standalones