Fix for standalone usage