fix for standalone