Work-around for run="standalone" bug